cleaner code...