Made code neat