Add comments
Alignment cleanup