Code clean up
Merge branch 'master' into function
Remove note