Small indentation refactoring

Removes cyclomatic complexity warning.
Handles current lines that are empty.
Merge pull request #341 from swang/small_indent_refactor

Small indentation refactoring