Specify type explicity.
Refactor naming.