Cleanup project

I always align parameters (i.e. schema and ancestors in this case) but it's a matter of style, so I'm fine if you use it everywhere else.