Nitpicky cleanup