reformatted with spaces instead of tabs
findById added