fixed indendation issues and cleared useless debug code