Codeimprovement

- Should close #85  and #84 
- Code Cleanup
- Sync Request now uses the Async and waits for the Result. Should prevent duplicate code

Rebase isn't working git shows me some errors that I don't know how to solve :( 

Please keep the {} around the ifs.