Refactored code to comply own standard.

fixes #11 
```@throws ``` left in a comment, looks inconsistent.