Added categories
Code formatting cleanup.