Change some attributes to be more explicit
whitespace fix