removed all private variables in CodeFormatter, some code refactored