some code cleanup and refactoring to simplify infoboxes
Merge remote-tracking branch 'origin/master'