Improvements, formating and factorization