Simplified some code (method not required)