Code formatting.
Added dispatch capabilities; removed generics.