Slight code improvements (style, lint, clean methods).