Cleaned up code, updated manifest version