Changed: Clean up a bit