Improve code style and add new config places