Cleaning code

This package is very useful. Let's make the code a little bit more readable.