Fixing an issue with the refactoring done earlier.
Cleaning up unnecessary comments.
Reformatting.

- Bringing indents in a little.
- Simplifying a little logic so that boolean shortcuts are taken faster.
Getting rid of a silly coding convention.
Resolving #12: #(un)patch_me for destructive patch.