Going to start on code cleanup