Some code cleanup & testing code