Some changes in the implementation. Styleguide updated