Less code & refactored