Cleans up code after kevin's code review