Cleaned up a bit..