code cleanup from prev commits