Small refactors (removed unused, removed duplicated empty lines, superfluous condition branches...).