Cleaned up starting functions