Add comments and remove newlines

The unnecessary newlines cause a undesired tab behavior