Cleaned some code, not sure where to go from here