Refactored and Cleaned Up Most Activities