Removed test code and added coments