Removed unnecessary use of constuctor and exception handling to simplify
code