First round of code standards

Replacing uses of or with ||
Replacing uses of and with &&
Fixed use of camelcase for variable name
Using alias_method instead of alias