More changes on code