some cleanup

some cleanup code (still being the noob here)