Moved SmartDashboard calls around