Prefix variable names with role name
Add newline to end of file
Fix for README