cleanup
fixed broken syntax. Removed useless class identifiers
cleanup. grouping of fields