Reorder functions, adjust visibility, add javadocs
Merge branch 'master' of git@github.com:itsmartin/DeathSwap.git