AOKP About refactor