naming and cleaning up