* removed hardcoded parameters
* reformat
* debug info fix