Removing ports utility
Refactored validations to clean it up and make it easier to test