More code cleanup. Final touches at HackRU