Updated codeing style