Fixed name formatting and removed tabs