Refactor/styleguide

@alexwllms