- Some code cleanup