Some code cleanup and updated manifest descriptions