Add a little bit of platform independence and delete a commented debug line