[#12] quick refactoring