Started adapting to Vizzuality code style