Small cleanup done