[Issue 13] ValidationModule: Refactoring/Bugfixing