Bump up to v0.5
Simplify naming of variables