Clean up

Pull request #236 part (request some small clean up).