Removed all extra design patterns. Keep It Simple.

Signed-off-by: Prashant Shah <pshah.me@gmail.com>