Some more code cleanup in achievements