cleaning up
readibility is a little better