Code cleaning
Removed duplicated use
More unit testing
Changed required php version