Code clean up, mostly whitespaces
Major refactor, bumping to version 1.4