Fix warnings & format code
Delete commented out code.