Style tweeks/cleaning up