Cleaned up code. Fixed exit to clean screen