cleanup, now following some scala standards