Small changes

Small changes made to the code