all good, need to clean up my code