Continuing to clean up source & UI