Removed & from function signatures were not necessary