fixed some warnings to style guide