Minor changes to cls file