Cleaned up standards failures

few standards errors tidied and removed code for design change