Design improved
Removed phpdocs