Cleaned up some code, new activity