Updated to styleguidelines