Capturing - Fix coding style issues