Added some code, applied naming conventions