Cleaning code - unit tests are still running fine
Add support for Pascal