Clean up main GUI methods, comments