Start of cleaning + comments