Remove debug/todo comments and shorten lines