Remove comments, add point function