Updated to proper method/__main__ format