cleaned up e20 scala