Formatting and cleanup \:D/