Clean code

Rename some methods
Add comments
Add error handling ...