Cleaned up a bit