still making the code pretty