Small cleanup on the code