Updated coding practises