fix usage with underscore attributes
fixes and clean code