Made some code prettifying