formatting, removed some debug sysout