Removed logging, changed design a bit