A few small stylistic changes

I am interested in adding some additional features to Beats, and am getting myself familiarized with the code base. During this process, I came across some minor stylistic changes I thought should be made.

I totally understand if you don't want to merge these in, as they more of a matter of opinion than anything.