Cleaning code, still works
finished cleaning on Alex's end