Refactor and changes to comply with Udacity Style Guide