The Citadel II

I wasn't entirely satisfied with "The Citadel". So, I tried to correct all the flaws and here is what I came up with.