Pause Functionality some Code Cleanup