Fixing spacing issues and removing old debug function.