cleaned up some stuff in the codebase