Done Hamdulelah with fixing the code. It is now the time to get rid of warnings and testing.