Cleaned up a bit 2