Cleaned up code in Activity