Initial Commit
some Clean up