Improving handling of comments
Fixes variable alignment & fmt formatter