JAL-1588 refactoring prior to 'save Chimera project'