Fixed lint and cleaned up syntax.