Removed some pesky tabs

Also fixed parameter conflict and added some comments