refactors and display code acceptance