Small cleanup =)