fixing formatting and mixed tabs issues