cuten the code a little