Code cleanup Session 1 - 20131610