@Chronothan work - #2054 , view - code cleanup.