Code refactor
Merge branch '1.x' of https://github.com/TheMuses/achilles into 1.x