Cleaned up a bit more