Made codes clearer, can be reduced