[US-6] code cleanup
Design Detail
Update init (US-7)