Cleaned up expressGroup a little bit.