Cleaned up layout of manifest