Variable name fixes, removed redundant property