Revision to code style

banners are changed to be more clean
conditional pass of code style
refactor
Adjusts to pass in code style