Cleaned up (a little)