Cleaned up a bit 4