Cleaning up a bit in account.php