Code cleanup on server/*.lua