Fixed more consistencies with spacing and ending the line before
brackets on functions.