code cleanUp