Increasing code quality

Various changes to the code to be more simple, testable and increase code coverage.
Fixed "Invalid regular expression" error, #111