Just arranged code a little bit