fix includes + code readability