All I can say, that maintaining that is going to be a pleasure. These on your face things are perfect for understanding the structure quickly. Usually maintenance phase is where software is for most of its lifetime.

The less magic, syntactic sugar and tricks, the better.