cleanup code
correct near/far modifiers