need to make the code look nice