diff --git a/alib2/src/AlibException.cpp b/alib2/src/AlibException.cpp
index 054eb0c615984dbdbb837a8a6eaf4da553cba502..b347cffdaeb627ee1954a370fc5fc35be7fdf0a5 100644
--- a/alib2/src/AlibException.cpp
+++ b/alib2/src/AlibException.cpp
@@ -9,17 +9,15 @@
 
 namespace alib {
 
-using namespace std;
-
 AlibException::AlibException() {
 
 }
 
-AlibException::AlibException(const string& cause) {
+AlibException::AlibException(const std::string& cause) {
 	this->cause = cause;
 }
 
-AlibException::~AlibException() throw (){
+AlibException::~AlibException() throw () {
 
 }
 
diff --git a/alib2/src/regexp/Alternation.h b/alib2/src/regexp/Alternation.h
index 75c9b1c5eba6dbbd0e378823e38e244b2ba2d2c6..da272b9ac3aa26475a86b7852ff5145c5cae48f6 100644
--- a/alib2/src/regexp/Alternation.h
+++ b/alib2/src/regexp/Alternation.h
@@ -38,6 +38,7 @@ public:
 	/**
 	 * @return elements
 	 */
+	//TODO mozna vratit vector aby slo reprezentovat a+a, optimalizace nechat na tomasovi
 	const std::set<const RegExpElement*, RegExpElement::PointerLess > & getElements() const;
 
 	/**