Cleaned up some comments, variable names etc.