Cleaned up a little (very little)