Refactored, code is more understandable