Coding cleanup