removed debug code
better enum usage