Cleanup, move constants out, test split_proj