Refactored server-side config loading + code cleanup

Good point, I'll remove this.