Variable name and indententation fixes