Cleaned up a bit...