Small cleanup/organization