A bit more compact, less functions!