cleaned up things for readabliity