removed whitespaces, fixed selfpaying