Update code to be like Styleguide