better syntax and structure