Distribution recompiled. Minor code-style fixes