Massive revamp for standardization of output