Removed semicolon
Cleaned up panic checks