Cleaned up issues with phase picker