Minor changes to improve readability of the code.
Implemented CREATE OR REPLACE SERVER. Test cases remain.