Non-functional reformatting update

    Resolves: https://www.pivotaltracker.com/story/show/59402954

    Code cleanup including
    - whitespace adjustment
    - static imports
    - removing unneeded type-safety annotations