No changes to the code, just removed comments etc.