style re-factoring