Fixed errors in comments
Tidied GE mapping classes