Fixed force quit

Cleaned up the code a bit