adding index to speed up query
removing one un-necessary constructor