restructuring: phplint working