jindent and code clean up