formatting/cleanup