Adding methods to get better view and better organization of code