added basic stuff for cleaner