Use Pipe type synonym to clean-up signatures
Clean up code a bit