Extract methods to be more clean and order