Refactored and scaled down Achievements class
Further Tweaks