cleanup code: remove commented out code & formatting