Clean up/nitpicking