Refactoring of code. Some wrappers for class attributes.