Minor updates to conventions
Removed unnecessary variables