Clean up a little bit more