Minor updates to commenting and code + change of syntax and addition of placeholders