Minor bug fix
Minor bug fix
Mior clean up
Clean up