Applied suggested changes