Initial skeleton code

Code clean up

more code clean up