Cleaned up controller/demos/Action, fixes #1

Thanks @ccmitchellusa