Cleaned up code and removed comments
Further comment removal and variable renaming