Used .startswith() instead of in, fixed comments