[#014] Making code more consistent