Massive style clean up, factorization and componentization