Small fix
General clean up