fixed encapsulation in previous commit, corrected some conditions in previous commit, replaced remaining tabs with spaces, corrected some indentations