Refactored ConfigParser
Fixed code style