Fix condition and delete comments