Cleanup + additions