Added todo
Updated comments and fixed phpcs