General refactoring.  Fix a couple of syntax issues as well as removing unnecessary code.