refactoring and making things better code changes