removed useless traits, fluent @return, php 5.3 friendly again