Update settings and clean code. See #102