Lil' cleanups..