removed unnecessary cruft
changed spacing around. Not using functions where we don't need to.