Removed unused method
Rewrited to be more readable