Phases container: code cleanup