Add .visible and make code more readable