Updated code formatting/style/advice