All done! Refactored and looking good now