Some refactoring and nice compiler info in C drink