Formatting
Test content
Removed uselss field
Added general exception catching