Cleaned up settings a bit...