Lil' bit cleaner code