Fixed minor typo
Fixed minor typo
Moved position of line to avoid error
Fixed some naming conventions