Remove option useNewStyle, refactor original method, much, much cleaner display