Reduced amount of lines in some functions