Refactored a few things on the customer controller