-Reorganize the code in a more compact and neat way.