Minor Coding practice changes