Some cleaning up, removing unnecessary comments and renaming some vars