Keep lines fewer than 80 characters
Use better code format
Use one-line if statements
Merge pull request #48 from kiela/master

Clean up a little bit the code