Capturing - minor coding style edits