Made code better