Improve readability of manifest decision making process
Close manifest leak