cleaned up code and added a separate runner