cleanup display and code readability