Style/dependency/comment fixes