Introduces some adjustments including the check for trailling commments