code cleanup
Merge pull request #28 from danielbentonturner/front6

code cleanup