Replace datastructures from self && stop removing comments

Replace enum with last char
Remove CommType enum and replace with more understandable logic
Make assignements fit on one line