Cleaned up format of manifest