updated styleguide from code clean-up scrum