Help! I can't make this city look decent!

I am a DM who is creating a city for my players to visit. They should be coming upon it next week. I have been trying to turn my sketches into a decent looking map, but am failing miserably:

http://imgur.com/a/kMxri

Could anyone help me turn this into a relatively nice looking city map?

Some things about Eastwick:

1. It started as just a military outpost, stretched across the pass between two large mountains. It's since grown (on the southern side) to house a relatively large city.

2. There is a large lake northeast in the mountains with a decent mountain river flowing down and out to the ocean. The city have dammed the river off and created a reservoir that has become somewhat of a resort for the wealthy. The reservoir is surrounded by a lush garden.

3. The river continues its flow down into the poorer area of town, where it is understandably less clear and clean. There is another reservoir in the lower section before it flows out the outer wall.

4. The wealthy have elaborate mansions and buildings higher up the face of the mountain around the garden and the reservoir.

5. The section of the mountain from the poor area at the base up to the gardens is paved with stone steps for roads and that is the trade district where merchants set up shop.

6. There are farms outside the outer walls leading down the river and to the west at the base of the mountain before the ocean.

I hope this is enough info to start. And I will continue trying to make my map work, but any and all help would be greatly appreciated!

Thank you in advance to anyone who lends a hand :)