Code cleanup - Refs: #1