APE Refactor and cleanup
Merge pull request #3 from tractorcow/refactor

APE Refactor and cleanup