Cleaned up unused variables, comments, and class.