Changes after my first review and code clean up