Cleaned Code added AppConfiguration as preparation to next fork