CLeaned up for netty