Minor updates to commenting and code + addition of placeholders