cleaned up a little to be able to compile