Added comments and removed local testing params