Removed functions and added return type