Improve function names and add types