Just changed some indenting

In this commit, I just changed some indenting issues and a few minor
things. Will add some functionality for conditional variables in just a
moment.