Simplify the structure

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Default handling is good enough

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>