added auto-complete, ripped out unecessary indent code