various changes to clean up codebase