Removed the @Contract annotation as it is no longer needed.
Minor refactoring.