Clean up and updated to actual device config(Thanks dazzozo)