Clarified a comment, and also refactored OrganelleFactory to be much cleaner. See #184