Cleaning up - Going to switch to WPF