Minor modifications to code styling