better formatting + indexes