[fix #3] fix elvis suggestions