- code formating
- Added some basic input validation