Just a minor thing: could you remove the commented lines? We have version control, so dead code is somehow superfluous...