Removed ! from method signatures where no longer needed.