Redone styling and omitted unused stuff

Naming conventions established, discarded unused and other misc
variables, code revised