Small indentation refactoring

Removes cyclomatic complexity warning. (Cleans up fix from #334)
Handles current lines that are empty. (Fixes #339)