Final commit
Small code changes