fixed a few style issues and naming.