Removing commented-out code and a FF style fix.