removed more test code and fixed indentation