(Issue 763) Code cleanup