This belongs here
Small cleanup