A lil' cleanup