Cleaned up code...