[Fix #4] fix elvis suggestions