Prettify the whole thing

Signed-off-by: Diego Gaustein <diego@gaustein.com.ar>
Kill 'status' and 'availability'

Signed-off-by: Diego Gaustein <diego@gaustein.com.ar>