Clean up (thanks to scrutinizer)