Code cleanup / Better UI responsiveness.