Code formatting & cleanup