Made code really clean