Add comments, remove spaces