chore(*): Cleanup and update