moved from odot because of o.pak dependency
fixed commas trailing
removed aspects