Improved some indentation