Changes to coding standard

1. bug fixes