Simplify __construct() method

Make it more simple and easy to read.