Code cleanups & fixed strange comma