refactored attribute handling
applied cca-codestyle