Removed some uneeded Activity and updated some format