Improved checks.
Removed extra newline
Merge pull request #1 from SpoonX/refactor/more-checks

Refactor/more checks