Small cleanup of code