(Minor) Clean up code