Removed TryParse + Code refactoring