making simple cleanups