Minor changes based on JSHint feedback