change configuration + make pretty