Initial
code clean up