[fix #33] fix elvis suggestions