code cleanup and ui ploish