Major refactoring work with input reading