added trait parsing + cleanup