Cleaned up variables, added exit command