Code getting ceaner...