Made consistent use of internal method and tweaked some white space