Cleaned up a bit;