Updated to v0.3 - improved logic, naming, and formatting