Fixed MELPA code review comments