Cleanup of the code, Status : 100% Working As Intended.