Cleaned up a few more &s