Initial checkin
beautify code