Cleaned up method definition