Refractored some code and add super secret device settings