Fixes

### Work Done
* Removed useless whitespaces
* Added newlines where needed
* Added strict comparison for null, empty and 0