Added another display style and cleaned up the code