update categories, cleanup code

Signed-off-by: Arnav Gupta <championswimmer@aokp.co>