Refactored post source
Refactored server
Refactored server