Just some housekeeping. Cleaning up code.