Cleaned up -- removed coments