Cleanup white space, update code styling and naming.