Clean up repetitive code and add ind. seat alert