Cleanup

Just making things a little neater.