Shortend the code...a little