Simple GUI :) along with some cleanup