Fixed some tabbing issues, and removed an unneeded overload