Improved code formatting, added @todo