Started applying coding standard