chore(style): comment & simplify stuff arround