arranged __construct
code cleanup