Cleaned up the &s