- Reformat of the whole code
- Added support for make and answer questions