cleaned up to make it look more pretty