code cleanup and changeable view