refactors and suggestions from the code review today