spring cleaning

cleaned up variable names/declarations/whats