ignore eunit
minor refactoring