Art/tidying

Removing some try-catch blocks to made the code a bit easier to read, and removed some code warnings