issue number #158

Removed TODO: items and added braces around one line 'if statement' targets following code review by @tleyden