CLEAN UP THE CODE