Design cleanup

Initial designed clean up done, but the working is still in progress.