[fix #2] fix elvis suggestions