Code cleanup before starting tonight

Some code cleanup!