Cleaning server code (just a bit)