Cleaning up slightly