cleanup, factor conditional formatting, data-view formating using bootstrap