Code cleanup and re-arange.