Cleaned up code a bit, removed assignment comments