[Style] More design based changes

Signed-off-by: Aniket Pant <me@aniketpant.com>