fixing includes, code formatting