Made code more standard