Added comments where AND and comma were put