cleanup code
correct modifiers