Code refactoring
Fix for bugs created in refactoring process
further refactoring
Fix for bugs created in refactoring process
Merge pull request #4 from IsItSaturday1/syntax-checking

Syntax checking