last minute code cleanup