Code Cleanup and added validations-post project review