Code cleanup (thought I committed this)