Added title and some cleanup
More cleanup