#449 Refectored update config methods

Please, review.
Again, too many spaces