Some modifications to confirm to code standards