Clean up comments and code

merge myself cuz why not