Small cleanup. Need to implement the inner logic now