[IMP] Modularizing files
[IMP] Getting rid of unused variable
[IMP] Adding Missing Descriptor