Added more best practice changes