Cleaned up some code before starting stage 2