Began cleaning and organizing code as it's gotten so bad that I'm having a hard time proceeding.