Fix non-circular-require warnings

This fixes miscellaneous warnings in fog including unused variables,
indentation mismatch and one warning for a duplicated attr_reader.