final code cleanup, ref #56