split in to the functions, looks more tidy, I think so...