Some code cleans...