Renaming and cleaning up old code