removed obsolete code
minor cleanup
added init