Cleaned up the start/stop commands.