Final cleanup... Hopefully?
Some annotation.
Added more annotation