Refactoring to use new Swift Style