[#17][#18][#19] minor indent refactoring