cleaning up code
updating codebase