Add return types to all functions