Added comments, made ts=4