1) Cleaned up a little