Splitted what I could in methods