Cleaned up code prior to competition. Code freeze until Pit Day