fixed indentation and consistency issues