Refactoring, added compile level to 1.6
Added better output
Fixed failing test