Simplified some code...