Fixed lint issues except for the issues regarding indentation (left this at 2 spaces).