Swagger & Code improvements