Yes Sir it can be simplified further.
Can I add this as an issue and do modifications later?