Small changes

Code cleanup