Cleaned up a little...