Cleaned up code and added prop & device trees