Fixes #1 Clearer names