Make code more clean