refactering some lego pieces