[#9] Added better validation
[#9] Cleanup