Cleaned up a little