comment code , clean up code ready for testing..