Refactored naming
Refactored pipelining logic