Code cleanup
Merge branch 'master' of git@github.com:MickealN/ExpBottles.git