indent fixes and taking out unneeded code