removed console logs and cleaned up display format a bit