Improve function AND appearance