Some cleanup regarding title editing

Addition to previous pull request for issue #4