Aesthetics improvement and clean code