Added to gatakka package and cleaned up some code.