john: cleaned up a little